Merge "Fixes context for tiles without longClick" am: fc40620103
am: fe41315774

Change-Id: I2af064dfadff15f44f200c1e7f1cedfe79aa271a