Merge "Reduce flaky of whenCanDisplayLocalUi_displayed"