Merge "Support rotation on secondary displays (1/N)"