Merge "Delayable marquee TextView" into tm-qpr-dev