Merge "Do not draw background if the background drawable is null"