Merge "Fix some bugs with display iteration/removal ordering" into sc-v2-dev