UBI is most definitely a solution. In the short term. Because you aren't going to jump from "everyone with a job!" to "no one has a job but it's okay because we have free stuff coz - AI". That's not going to happen overnight.

There is going to be a reasonably long and painful bit in between where people still have goddam mortgages to pay and investment of time and resources into assets that they own.