Merge "Make NearestTouchFrameTest run on more device configurations" into oc-dr1-dev