Merge "Speed up MmsSmsDatabaseHelper thread updates"