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

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