Merge "Fix issue in scrolling in remote compose widgets" into main