Merge "Bluetooth: Use correct previous state while moving to STATE_OFF"