Merge "Ratings for RemoteControl" into klp-dev