Merge "Only dump active display mode when it exists." into sc-dev