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

Change-Id: Idc4b2440a748e3b77f6bb75a3f2c221a6056198c