Merge "Fix bug with Fbo layer clipping" into jb-mr1-dev