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

Change-Id: I055e40a9ce8aed257f14efd77677031a6656a034