Merge changes I7c542db9,I6f809ce2 into rvc-dev

* changes:
  [Media ML] Add uid as parameter
  [Media ML] Implement button session management