Merge "Fix swapped int params in DisplayContentInfo ctor" into tm-qpr-dev