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

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