Merge "modularize the gesture detection mechanism for magnification"