Merge "DO NOT MERGE: SF tests - completely remove ChildLayerTest"