Merge "CE: Introduce Output::GetDisplayId()"