Merge "add shutdown animation"
am: 8aae1b158a

Change-Id: I1ccd7473d8ed305597fbb98b724dc7748b577d14