Merge changes I3b8babc2,I56ea3eee into rvc-dev

* changes:
  Changed the landscape experience of quick settings
  Fixed an issue where the media player would shift when editing QS