Merge "Merge "Fix view does not show fill dialog" into tm-qpr-dev am: 5bca0e0058" into tm-qpr-dev-plus-aosp