Merge "Fixed an issue where added icons were white in multiwindow" into oc-mr1-dev