am db0944de: am 60e7f819: Merge "Improve RemoteControlDisplay registration" into klp-dev

* commit 'db0944de128247e7e6016982a14513b04ac5e6f1':
  Improve RemoteControlDisplay registration