Merge "Use aligned width and height to compute size." into lmp-mr1-dev