am 31168493: am b4621174: am 5b7793ca: Merge "Expand scrim all the way to the right" into mnc-dev

* commit '311684931c38292a5ed8f78ed839141c0a29e9f9':
  Expand scrim all the way to the right