Merge "Fix crash from UserNameViewController.removeAll()"