Merge "System crash fixed when turn off MagnificationGesture" am: 8f87949340 am: 1ff9f8ad50
am: af0596d317  -s ours

* commit 'af0596d3172ce9ccc98aa494d092cd146ce15b05':
  System crash fixed when turn off MagnificationGesture