Merge "Fix jank in showing conditions and suggestions in cold start." into oc-mr1-dev