Merge "Merge "Address ghost spots that show up after touchscreen is re-enabled" into tm-dev am: 02ecde0361 am: d34c726720" into tm-d1-dev-plus-aosp