Merge "Preserve ResolverDrawerLayout fully collapsed state across relayout" into mnc-dev