Merge "listen to correct intent extra for defaultSubIdChange"