Merge "Add an API supportsSwitchingToNextInput" into klp-dev