Merge "GuidedStepFragment: differentiate clicking confirm button and cancel IME" into nyc-dev