Merge "Handle null component name for default sms app" into main