Merge "Reset scene mode to Auto in camcoder and panorama modes."