Merge "Bug 5045498 New implementation of remote control API"