1.Update question value after BDS change code to avoid save invalid data. 2.Fix a corner case bug that may cause unexpected popup when changing the legacy device order. Signed-off-by: ydong10 Reviewed-by: lgao4 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12892 6f19259b-4bc3-4df7-8a09-765794883524