Merge "Disable "Battery dialog" for default apps"