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

Change-Id: Iae92b356edab987ba8f438a756bc548c8d3bdbda