Merge changes I2769bc3f,I20171f31 into tm-dev

* changes:
  Use configuration for display rotation instead of display
  Refill all the dispatcher views when updating rotation