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

Change-Id: I33963010e5402b123510df5e4a63fa85e72b10c4