Merge "[Magnifier-39] Hide both handles on overlap" into pi-dev