Merge "Camera: Notify camera service about display changes" into sc-dev