Merge "A11yMenu: also delay before locking the screen." into main