Merge "Stat icons for phone are now the right size" into ics-mr0