Merge "Fix issue #11278906: Some wm commands fail on shell users" into klp-dev