Merge changes I2dfd15ff,I7507e25f

* changes:
  Support rotation on secondary displays (3/N)
  Support rotation on secondary displays (2/N)