Merge "Remove empty remote control client listener methods"