Merge "Color extraction should not block switchUser" into oc-mr1-dev