Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev