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

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