Merge "Restore the isModule check when enabling rollback for apps"