am 6857ffc9: Merge "Fixed a jump with the panel scrim" into mnc-dev

* commit '6857ffc940bc204269de4ae2a1937794f254286a':
  Fixed a jump with the panel scrim