am 85a15ee9: am be8cff94: Merge "Reflect framework dimen changes in editor" into lmp-mr1-dev

* commit '85a15ee93aeb35e9c13298189ad0e031d2707286':
  Reflect framework dimen changes in editor