Merge "GuidedStepFragment: fix initial selector view size flicking" into mnc-ub-dev