am addc906f: Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev

* commit 'addc906f70ba24aa4b649fff7f98d88b96c8d808':
  Force clipping on layers that fail to be allocated