Merge "Add dumpsys window logs for ModifierShortcutManager." into main