Merge "Check ongoing flag for media control dismissal" into tm-qpr-dev