Merge "Use the EditText's gravity for TextInputLayout" into mnc-ub-dev