Merge "Fix IsUsable to check for each controller separately"