Merge "De-Mock PhysicalDisplaySwitch transit tests" into main