Merge "Reland "Fix the gap between notification and smartspace is too large in large screen portrait mode"" into main