Merge "Revert^2 "Notify DecorContentParent about content change"" into main