Merge "Fix drawer layout's approximation of addChildrenForAccessibility()" into klp-dev