Merge "Drawer support prototype" into jb-ub-mail-ur9