Merge "Fix interaction of magnification and Final-crop." into oc-dev
am: 99fbd00ac5

Change-Id: I9e366ea4c463cd5591e6b92f4539c04f10f70ff8