Merge "Fixes for parentless layers"