Merge "HistoryAction: Amend `margin` in collapsed form state"