Merge "Deferred setup banner updates intermittently" into oc-mr1-dev