Merge "Enables flag for modern architecture in KBAV." into tm-qpr-dev