Merge "Rename MediaSession2/MediaController2 methods" into qt-dev
am: 1c41060583

Change-Id: Id1d20ab9560838b833ea95d90effdcad18d087cf