am e69e0fde: Merge "Fix issue #3374356: Buttons sometimes don\'t highlight" into honeycomb

* commit 'e69e0fde6cf0e6302d5a05363a3db7a9c555e9dc':
  Fix issue #3374356: Buttons sometimes don't highlight