Merge "Make bootanim multi-display aware" into main