Merge changes from topic "capture-child-layers" into pi-dev am: 17511b0527
am: 23fa79a4ec

Change-Id: Ic61ac0b0e60c46692ae68a59aa74da9649044e59