Merge "Remove Gallery and Music role" into qt-dev