Merge "Revert^2 "Include invisible parent layouts in assistStructure"" into main