Merge "Migrate Battery Saver" into main