Merge "Correct the namespace of aconfig flag for battery_saver" into main