Merge "Cleanup of disableContinuousShortcutOnForceStop" into main