Merge "CameraManager: Update display size query"