Merge "add shutdown animation" am: 8aae1b158a am: e15756a604 am: 8aebd47ca5
am: 33af57e331

Change-Id: I4741079c8eebe85a3c90ca172e2a12da3cb7b3f2