Merge "Fix FATAL EXCEPTION on SmsStorageLowWarningActivity"