Merge "Fix issue that expanded widgets appear before next item moved down" into main