Merge "Don't hardcode 320x480 size in the FingerPaint API demo."