Merge "Remote control display API and implementation"