Merge "Reflect framework dimen changes in editor" into lmp-mr1-dev