Merge "Tweak the selection of media button session" into qt-dev