Merge "Camera: Handle display configuration change events" into sc-dev