Merge "[Magnifier-78] Fix shadow on first draw"