Merge "Improve RemoteControlDisplay registration" into klp-dev