Merge "[Magnifier-39] Hide both handles on overlap" into pi-dev am: aeed443b5b
am: 2bcd41461e

Change-Id: I43c0ad4f2de9dc51ab783051e7cee0f69751f63c