Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev