Merge "Generalize notifications logic into a subclass of OverlayViewController" into rvc-dev