Merge "Fix CastError on SecondaryDisplay" into sc-dev