Merge "[Catalyst] Allow external SET for Use Battery Saver" into main