Merge "Experimental support for enabling the use of "surface input" mode"