Merge "Don't stop animation when starting windows app token changes" into mnc-dev