Merge "Support multiple IRemoteControlDisplay" into jb-mr2-dev