[automerger skipped] Merge "Fixes context for tiles without longClick" am: fc406201 am: fe413157 am: 190eb9c6 -s ours Change-Id: I979b96ceeb7afdd6760f2777462fd8d0949e8a0e