Merge "Make replaceLayers less flaky"