Story 920: Make upload tutorial screen have an upload and cancel button

Also, fix line-height (make it the same as in uploads dashboard
tutorial) and make padding around the image smaller to make sure it fits
on most devices (jgonera).

Change-Id: Id44543263056c6b999e541076817aeddd46aceeb
Merge "Story 920: Make upload tutorial screen have an upload and cancel button"