Merge "Fix the RemoteInputViewTest mock user context"