Merge "Remove persist.bootanim.color property definitions" into main