Merge "Add default phone/sms to battery whitelist apps." into pi-dev