Merge "Fixed an issue where added icons were white in multiwindow" into oc-mr1-dev am: 3f0dd94efc
am: 9ff8ac0596

Change-Id: I79c2d4cb34b98e0e430cbaa525233d165bca2c30