am bc09a364: Merge "Fixes for setClipBounds()" into jb-mr2-dev

* commit 'bc09a364c3fd49470b936e7bc2521f6de9ba07b4':
  Fixes for setClipBounds()