Merge "Make TextView do not show IME when fill dialog popup" into tm-dev