Merge "Skip user restriction check on desktop" into main