am 457e002d: Merge "NPE in ConversationContainer" into ub-gmail-ur14-dev

* commit '457e002d49a4aa245486228539abb681516d3d48':
  NPE in ConversationContainer