Merge "Make sample use TextInputEditText" into mnc-ub-dev