Google is starting to merge Maps and Waze teams; two separate apps will remain