Merge "Consider allow-in-power-save-except-idle whitelist while updating rules." into oc-dev