Merge "Disable notification background drawing"