Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev