Refactoring notifier to ViewGroup subclass. Revert to single notifier without ListView
Post-merge push