Merge "Make RemoteController weakly referenced by IRemoteControlDisplay" into klp-dev