Fix broken message group selector

It kept showing the loading indicator for ever and could not change
tabs. Follow-up to broken refactoring in I8175a78e1becb32.

Change-Id: I6bb2bb81c79cccfe7c0d0522208fa7979dad47a9
Merge "Fix broken message group selector"