Merge "Fix overlay below activity is dismissed" into main