Are haircuts allowed this year on Friday, as it is the Erev Shabbat before Lag Baomer (which is on Sunday)?

The Shulchan Aruch (493:2) wrote that taking haircuts is permitted from the thirty fourth day of the Omer (Spharadim), according to the Rema the thirty third day (Ashkenazim), and that if Lag Baomer (the thirty third day) is on Friday Spharadim may take haircuts on Lag Baomer in honor of Shabbat. The Rema added that also if Lag Baomer is on Sunday (i.e. this year) haircuts may be taken on Friday, but according to the Shulchan Aruch on such a year haircuts are permitted only from the thirty fourth of the Omer (this year Monday). Rabbi Ro'i Margalit