Merge "Update NotificationIconAreaController"