Merge "Rename MediaSession2/MediaController2 methods" into qt-dev