Merge "Ensure ResolverDrawerLayout is visible to accessibility services" into mnc-dev