Merge "Fix powersave/powersave idle whitelist" into main