Merge "Camera: Connect activity resizing state to camera service" into sc-dev