Merge "There are Two modifications. 1. Restucturing Notification Manager Class ...