Merge "Update heads up notification based on video state"
am: eceebff226

Change-Id: Ie330e3b4b11c0b33bced551ec5ad230adaab5ade