Merge "Improving performance of notification panel" into sc-dev