merge cherry pick for active display