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