Merge "Scale phone state icons." into nyc-dev