Merge "Do not keep MediaSession Tokens for Notification accounting" into tm-qpr-dev