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

Change-Id: Ied6ed85e8429f7b4a20c49254875ce3cd08bb07b