Merge changes from topic "am-cd20f71d34d84d07af3b3dca9c0b8ef3"

* changes:
  Merge "Fixed an issue where icons could remain white" into pi-dev am: 5f259a7d90 am: 991c9f1af0
  [automerger skipped] Merge "Removing unused invert helpers" into pi-dev am: 25185596cf am: 4ffeb99c7d  -s ours