Merge "Fix the BFSL calling app SDK level check" into main