Merge proposals dependent on lp://staging/~renatofilho/mediaplayer-app/scene-selector-desktop

1. scene-selector-desktop
2. Dependent merge proposals