Merge "Cancel dark animation when new one arrives" into pi-dev