Merge "Force isolation of clip and matrix within layer" into lmp-dev