Merge "using the correct intent extra for subId"