Merge "UI modifications for user picker Test: tested on Mojave bug: 75023449" into pi-dev