Merge "Color extraction should not block switchUser" into oc-mr1-dev
am: 4f65a35713

Change-Id: Ic77d657bef1e7336e1774395da26886e4840a03c