Merge "Fix NPE in processForRemoteInput"