Fixed google maps crash bug
Merge test