Merge "Clean up usages of flag allow_shortcut_chooser_on_lockscreen." into main