am 25ea0bc4: am 18995dab: am a7784757: am 457e002d: Merge "NPE in ConversationContainer" into ub-gmail-ur14-dev

* commit '25ea0bc400df980f276b677f7e719e22a97a5a2b':
  NPE in ConversationContainer