Merge "Add support for device state based auto-rotation preferences in Settings." into tm-dev