Merge "toolbox: indicate why swap{on|off} failed"