I actually boot looped after manually setting those env variables and updating the relevant shell script...
I couldn't hook up a UART given that it was unexpected and had family "pressures."
EDIT: Here's my updates that I made prior to boot looping when trying to move to master:
EDIT2: My next self build (again Robi's branch) after setting the above worked. It was going to master afterwards that bootlooped: