Merge "Add show more for accounts and folders in drawer" into jb-ub-mail-ur9