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