am b024bbf6: am 6da66ef4: Merge "Handle screendumps for all framebuffer sizes"

* commit 'b024bbf6a1daf752a8d756bfda472fe6fb48dd9e':
  Handle screendumps for all framebuffer sizes