Merge "Make shutdown use the UI context." into oc-dev