Small update for App bootstrap (remove extra navigation for basic flow)