Merge "DO NOT MERGE DrawerLayout emits inconsistent accessibility tree." into klp-ub-dev