Merge "Fix VectorDrawable_Delegate and DrawerLayout" into nyc-dev