Merge "Update RemoteController info when enabling/disabling it" into klp-dev