Merge "Phone theme updates." into nyc-mr1-dev