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

Change-Id: I37fc4a2e5fc2832c2ab78b2cee4b7098353b8cc6