Merge "Make sure that DrawerArrowDrawable invalidates itself" into lmp-mr1-ub-dev