Merge "Close drawer when not changing folders" into jb-ub-mail-ur9