Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier