Initial changes for supporting DrawerLayout