Merge "Fixed an issue where icons could remain white" into pi-dev am: 5f259a7d90
am: 991c9f1af0

Change-Id: I0147e3b675408aded6b30275d873b2e6348ce2e2