Merge "Clean up dangling layer hierarchy references" into main