Merge "Render to measured size when using expand mode" into lmp-mr1-dev