Merge "Add DisplayContent#forceDesktopMode"