Merge "Fix setSurfaceBehindVisibility(false) being ignored" into main