Merge "Change Shamu's default video resolution setting." into ub-camera-glacier