Modify to use remote-surface for WatchApplication