Merge changes Ic12d6d90,Iecd5e1bc

* changes:
  Implement transitn animation while switching the mode
  Change magnification animation callback (2/2)