Merge "Non-visible layers are now "inactive"" into main