Merge "Fix failing testForceDark_rendersDark test"