Merge "Ensure the screen is locked after closing the screen" into main