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