Merge upstream: Switch to renderer only on 'play'