Merge "Support accessibility on embedded hierarchies (2/n)"