Merge "Fix wifi animation issues" into nyc-dev