Merge "Fixed Control and Magnifier API" into tizen