Merge "Separate personal/work tab in LocationSettings"