Merge "Fix issue where location provider overlay may not bind" into main