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

* commit 'd6ff1904dc8e5a48b0e47a5f2a9e5d95c118a8f1':
  Workaround frame size issues.