[3.0] Modify to use remote-surface for WatchApplication