Merge "Always try to close DB after saveRecentQuery" into ub-gmail-ur14-dev