Merge "Cancel dark animation when new one arrives" into pi-dev am: 7c0e462b20
am: 59e792baeb

Change-Id: Ie5de6d2c5dd5fd871aa2a76e146be58377abc059