Merge "Implement user-settable power save whitelist." into mnc-dev