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

Change-Id: I507c2ab2a39df004ebca354fbee9a4150f9a818d