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