am 4dae506c: am e27790db: Merge "Force isolation of clip and matrix within layer" into lmp-dev

* commit '4dae506c27327a3ddced29fc15880c86abe3a3a5':
  Force isolation of clip and matrix within layer