Merge: app.nit: improve apps life-cycle