Merge "Fix flaky test at AccessibilityEmbeddedDisplayTest"