Merge "Add a config to control whether we should attach the nav bar to the app during app transition"