Merge "Minor cleanups for current user popup panel"