Merge "Lock out ResolverDrawerLayout dismissals during animations" into oc-dev