Merge "Remove flakiness from DrawerLayout tests." into mnc-ub-dev