Merge changes from topic "auto-rotate-settings" into ub-launcher3-master

* changes:
  [automerger] Bringing back auto-rotate settings am: 40253329c5
  Bringing back auto-rotate settings