Merge "Change OnBackInvokedCallback creation to lambda" into tm-dev