Merge "Force layout and animation when display changes" into lmp-dev