Merge "Add back the role-dependent VDM mirror display logic." into main