Merge "Fix did not show active status when changing the active device" into main