Merge "Hide spinner options for locked users" into main