Merge "Reduce double header spacing in Conversation and Call notifications." into sc-dev