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