This patch paves the path for refactoring the Drawer into the Scaffold to support edge swipes and peeks.
