am 2950da34: am 3b2ebfa3: am 224dfca6: am c273c178: am 66e66831: Merge...

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

* commit '2950da34':
  Render to measured size when using expand mode