Merge "Add logging and error detection around quick switching" into main