Aircast & Screencast/Chromecast icons merge question

On New video player view, the Aircast & Screencast/Chromecast icons are displayed separately at the top right.

As an UX point of view, both features seem extremely similar: they both allow access to external playback, either on remote screen or audio output. This is even more close when comparing to audio aircast & chromecast audio.

Question: wouldn't it be more relevant to group both menus under one icon, having a list of external devices - maybe sorted or splitting sections by category (airplay, chromecast, etc.) ?

This would also help having the same look alike between the two selections.