Merge "Store pending override config instead of creating ActivityClientRecord"