Merge "Fix spacing and align in drawer" into jb-ub-mail-ur9