Merge "fix an orientation change drawing artifact."