Merge "Fix clipping not being activated on children in groups" into nyc-dev
am: b6f640607b

* commit 'b6f640607b5b8124b1a1c216ea4264511b145774':
  Fix clipping not being activated on children in groups

Change-Id: Icf5c68956bb3c261ce27b195426ebd3aefe8b83b