am 61c37797: Merge "Fix bad drawer items (folders and accounts)" into jb-mr2-dev

* commit '61c37797748d1fd4f591607b537405ab6b330f30':
  Fix bad drawer items (folders and accounts)