Merge "[Magnifier-36] Fix content clamping inside view" into pi-dev