Merge "Fix AE LockTaskMode issue on fold devices" into main