Merge "Move Drawer management code to a facade."