Merge "Annotate getActiveSubIdList() as NonNull" into main