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

Change-Id: I5cf0e27260439b858d8026ff32c9f004cc7bb639