Merge "Address ghost spots that show up after touchscreen is re-enabled" into tm-dev