Merge "Clear TextView error when text changes" into lmp-dev