Merge "Refactor ExpandableNotiRow"