Merge "Fixes issue where personal/work tabs could overlap search reasults." into tm-dev