Merge "Implement smart-zoom per Adobe request."