Merge "Fix NPE in onMessageCursorLoadFinished. b/17400031" into ub-gmail-ur14-dev