Merge "Add commandline option to update power-save-except-idle whitelist." into oc-dev