Merge "[Magnifier-48] Allow on-the-fly zoom update"