Merge "Make shutdown use the UI context." into oc-dev
am: 5879d28f4d

Change-Id: I51e92495a3c8b98357f82b5dea83608ea36aabc0