Merge "Reduce gap above user list in multiuser settings." into tm-dev