Merge "Camera: Compare old and new overrides for finishConfigure" into qt-dev am: 584d868a6b am: 988810bb8b
am: cf5ed52dae

Change-Id: Ic87b5d9de0e59f9a465a39e5baf57207a1546ed6