Dubai to get new public beaches and green spaces under Dh2bn plan