Merge "Revert "Fix the problem by Android 15 edge to edge changes"" into main