Merge "Fixed statuses on Battery Saver column." into nyc-dev