Merge "Camera2: Add OFF_KEEP_STATE mode"