am 1dade011: am 7ddc3cec: Merge "Reorder config.xml constants related to auto-rotation." into klp-modular-dev

* commit '1dade011d740c58510d3731be11491dbd028ebda':
  Reorder config.xml constants related to auto-rotation.