Merge "Fix the companion device state when unavailable"