Merge "fix(force invert): listen for changes to force invert setting" into main