Fix Junk folder icon alignment when it's nested in inbox folder (#1489292)
- reverted commit 856ec447fa0a7ddd0ad19ed57fc0031040037284 which shouldn't
  be cherry-picked from master