Merge "fix NPE in drawClipped"