Merge "add shutdown animation" into oc-dev