Merge "overrideConfig API did not notify platform correctly"