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

Change-Id: I239265ac026c19addc51d21d446c7a3db30a4e21