Merge "Fixes clicking on foreground user in the switcher." into pi-dev
am: a153811ad1

Change-Id: I3b7a6f0e6d8c62661ae7aa758207379173454bac