Merge "Differentiate between clicks for focus and actual clicks." into honeycomb