Merge "More Data Saver / Battery Saver modes cleanup" into nyc-dev