Implement expandable notifications for 4.1
Fix issues found by Code Analysis