Merge "Align lockscreen state and picker state for Device Controls shortcut" into main