Merge "Fix for N4 Video Rotation Bug" into ub-camera-haleakala