Merge "adjust margin on TextViews and ImageViews in onboarding and tutorial screens" into ub-camera-glacier