Merge "CE: Output::setDisplaySize should change only bounds"