Merge "Workaround TextInputLayout state changes becoming permanent" into mnc-ub-dev