v2.0, pull notification fixes from CastCompanionLibrary