Merge "Also skip calling ShortcutManager APIs if work user is locked" into rvc-dev