Merge "Add divider line in Multiple users screen" into pi-dev