Merge "DO NOT MERGE Update volume dialog colors" into pi-dev