Merge "Don't fill boundary rectangle when drawing shadows."