Only call setOriginalDimensions when non-null values are provided

Otherwise the button is never disabled.

Also assume that dimensions objects are always just width/height
as specified in the documentation.

Change-Id: I9530ed4257e88b90d4073b9d21d7a7490aa16f7b
Merge "Only call setOriginalDimensions when non-null values are provided"