Merge "Allow onSessionCommand return null"