Merge "Hide types when the associated (empty) edit text loses focus" into mnc-dev