Merge "fix bug for double tap zoom" into tizen_2.1