am 47f698b8: am c38c93f4: am 1a1e24f1: Merge "Update RemoteController info when enabling/disabling it" into klp-dev

* commit '47f698b88e8be919f3cc0400fa9f1076c1df037c':
  Update RemoteController info when enabling/disabling it