Merge "Merge "Check ongoing flag for media control dismissal" into tm-qpr-dev am: f5fb9c6346 am: 193abff180"