Merge "Stack header account information in Groups tab" into jb-dev