Merge "Revert "Add support for device state based auto-rotation prefere...""