Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev