Merge "Improve the boot animation fix"