Merge "Motion for hub <-> edit mode transition" into main