Merge "Do animations correctly in systemUI" into nyc-dev