Merge "Keep Multiuser toggle hint visible at all times" into main