Merge "Fixed DisplayCutout flaky test"