Merge "Allow CAMERA_CMD_SET_DISPLAY_ORIENTATION to change during preview."