Merge "Fix LocationOnScreenTests failure"