Merge "Fix BT keeping wrong state issue"