Merge "Include invisible parent layouts in assistStructure" into main