[automerger skipped] Merge "Fixes context for tiles without longClick" am: fc40620103 am: fe41315774
am: 190eb9c64e  -s ours

Change-Id: I979b96ceeb7afdd6760f2777462fd8d0949e8a0e