Merge "Clean up SmsApplication and expose getDefaultSmsPackage"