Merge "Increase tolerance for ChildLayerTest, ChildLayerAlpha" into sc-dev