Merge "Revert "Don't skip calling requestLayout to the parent view"" into main