am 08654d40: Merge "Workaround frame size issues."

* commit '08654d40cdd256f6a6c8619bf06d04d4c819714a':
  Workaround frame size issues.