Merge \\"Do animations correctly in systemUI\\" into nyc-dev am: afa0f25379
am: 0864de19f6

Change-Id: I6deba21b568c0713921c27af7f9a881bc1eea9e4