Merge "Extract getTestMarker and require EditText tag" into main