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

* commit '7ddc3cec322f0a4968f00c6bdf8e396094e36f5b':
  Reorder config.xml constants related to auto-rotation.