Merge "Device state auto-rotation settings: log device state specific state changes" into tm-dev