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

Change-Id: I1fdb7cc9eba446167cf7d78cae2533a4bb5c3f89