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

* commit '903e6865cae15d5967c4c810ece17c021945c2e4':
  Handle screendumps for all framebuffer sizes