am 21b0c88b: am c540f8e9: Merge "Revert "Take the input device into account for meta state"" into klp-dev

* commit '21b0c88b3c290141f9a7593bb249ab117af48b91':
  Revert "Take the input device into account for meta state"