Merge "Revert "Fix notification place holder is too low in foldable portrait mode"" into main