am f9ffa6d5: Merge "Drawer support prototype" into jb-ub-mail-ur9

* commit 'f9ffa6d5c414d08197d10039dd754f9ef4e2e0ae':
  Drawer support prototype