Merge "Fix notification top clipping" into sc-dev