Merge "Revert^2 "Remove persist.bootanim.color property definitions"" into main