Merge "Lazily inject ShadePrimaryDisplayCommand" into main