Merge "Fix race condition on size compat UI" into sc-qpr1-dev