Merge "Update renamed util function M3HCTToColor in launcher code"