GF32723 more fixes for edit DEC related issues like not checking for
context switching.