Merge "Improve the boot animation fix" into tm-qpr-dev