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

Change-Id: I0465aa07525c485236a9de4f3d28b70dff3e2eba