Merge "Move shutdown UI to sysui (when possible)" into oc-dr1-dev
am: de0c539dd4

Change-Id: Ide08868338f55a826f36ebc8f70c4d1decaefb70