Merge "CTS: De-flake LocationOnScreen tests" into pi-dev