Merge "Fix unexpected process restart of size compat mode"