Merge "Generalize notifications logic into a subclass of OverlayViewController" into rvc-dev am: d307dceb am: 6e07a87a Change-Id: I2e15ac407bc9e8dcf40ad5580c263105fd7325af