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