Merge "add shutdown animation" am: 8aae1b158a
am: e15756a604

Change-Id: I8595e5b6865f5c0f7ef5b43166853370ada8a141