Merge "Re-add dividers when expanding notifications." into sc-dev