am 1415bb7a: Merge "Differentiate between clicks for focus and actual clicks." into honeycomb

* commit '1415bb7a948e0add9f6beb6dccbea70e9d2bedd0':
  Differentiate between clicks for focus and actual clicks.