Merge "Add DisplayContent#forceDesktopMode" into rvc-qpr-dev