Merge "Revert "Remove background drawing behind notifications""