Merge "Enable the new while-in-use / BFSL logic for V+ apps" into main