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

Change-Id: I564d3a101532b07ec19e648d4901e55d5fa12e84