am 224dfca6: am c273c178: am 66e66831: Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev

* commit '224dfca641fb02b4a4a47deeeda9d03036c613fa':
  Render to measured size when using expand mode