Merge "GuidedStep: Turn on underline of EditText" into mnc-ub-dev