Merge "Fix NPE in SmsManager and keep existing behavior"